Added status managers + big rejig