Final commit before rebuilding the Tilemap system.