wip: working better constructor; tests