A lot of changes, started working on the theme in earnest