move roles into host

Maybe we should have not merged this then