work in progress commit

wip