A little progress on assn 3
Merge cleanup