WIP: Further refactors