WIP refactor, etc.