Finished moving fees model functions to its own model