packaging
some todos
todo, fix import