WIP Gigantic refactoring...