wip - more things