todos, namespace and sppt. secondary w\o primary

added a few todos, namespace and possibility to have secondary w\o
primary