sorting out merge conflicts and all the code from last friday
commit