change model for map so all calcs use one method
start adding login