intermediate commit of my stuff
Made changes such that the merge is now possible.