Switched back to two handlers
First round of api development complete