Styling map
Merging waffles into master
Merge branch 'waffles'