WIP The Great Refactor begins!