Fixed new tile rendering
Set up framework to implement merging