Finish most functions

Added new handlers and new model method