added a bunch of classes around tile collection and control mode