CS 11/13/2013

Big fix on Entity, Tower work