Updated tower code.
Merge remote-tracking branch 'origin/master'
I think I got the enums working.