Refactor and GET almost done