first attempt
Merge branch 'quick-style-attempt'

merging in attempts to style