Moved 201 code to router
@TODO: find a way to move location as well