Began integration for both sides of tower

Changes courtesy of @mauimart
Merge branch 'rightside' into master
Merge pull request #2 from IolaniARE/rightside

Rightside -> master