wip
first version working