WIP: moving init out of components