Made it more restful. Will probably break everything.