Checking in some code
Done merging