Changes from Friday
Merge conflicts
Placated compiler