Entity Class and Tile Fix

Here is the entity class and the fixes to Tile.  Lets hope test comes
next!