Start of changes

Lots of stuff that will probably get pulled out (large icons)
blah

b lah