made new models

except @location in admin controller is broken