[WIP] Feature/manager