initial integration completed, still a few quirks
Add ben's most recent styles
Merge branch 'develop'