first commit
have fixed merge conflicts. will now eat cake.