Added more Tiles, and more functionality