Breaking out recreation classes and tweaking models
Fixed