Refactors - wip