wip: split up from tmp433 branch