Moved quite a bit of stuff around. Not happy with it yet though.