#412 still a work in progress

I bet you didn’t see this coming.. neither did I. A LOT more work to do on this.