Most of the controller refactoring done
Stuttering with moving, occasional gmaps bug