Bursting at the Seams

Refactoring