COmmit before completely rewriting
Mid porting to a proper restful setup