Added level management, clean some things up, moved some thing around and added upgrades.