wip continues ...