Started work on tile class + bug