Committing to merge davids stuff
Merge resolution