Fixed model errors
Moving location to model, unfinished