... and renaming it. Not sure system is valid 100%, also "object" was tempting but object is used for objects in 3d view eh...
Need to talk about this, maybe it will be more clear after testscreenings will have done the add object framework (we'll move stuff anyway).