Refactors getting ready to merge with master.