another wip commit - some rough progress