MNT: Intermediate refactoring commit, primarily because I need to change computers...