Finished with mall tiles!  Untested - some fix commits to follow.