Manually added in Roland's changes

The change include collision as well as rendering the tilemap