#62 fixing some todos
#62 moved some functions from action to model