Committing All

Merging tower code :)