recent wip

I'll post the completed version at a later date.