Implemented some moves, global fix and won rebase