Begins RESTful backend (WIP)
Actually fixes merge conflict