Huge OO refactoring -- methods into private or deleted
Moved location into separate model. Old attrs and forms remain and MUST BE FIXED