Initial work

This is largely stylistic. I wanted to address what was 'broken' before making any changes based on personal preferences in terms of how the code looks, versus how it behaves.