wip, starting to run the new refactored version