Fiddling with stuff
Fixed conflicts
Final comments and writeup should be done