Merge cleanup

Putting things together