Fixed the wrap around

Took the wrap around out of the model and into the controller