Got most of the handlers and logic working