wip
works with 0.4.0