finished quick, working on merge