WIP: Some refactoring