Merge all current code

Merging to origin to wrap everything up for the term.