Push/pull are working && lots of refactoring