Backup before 1st refactor

Creating a base point to go back to in case this refactor ruins
everything!