wip: more things