Checkpoint before final merge.

Everything seems to be in order for the oop refactor.
Going to perform some final checks before merging
into master.