All changes prior to major refactor