WIP: This might brake stuff with hidden dependencies though I should. Not, lets stage it. About time to flush out any hidden dependencies.