Inital commit from previous glia incarnation