WIP, small refactor