Major progress/refactoring/etc...