V2 feat from repo to rest

Lucy, you has some refactoring to do!