Add Entity class. Fix side-of-building collision.