further wip work