Added code for other shapes to TileCalculator