branch created
wip: core rewrite