Made some good progress during a night time coding session. Scrapped part of an approach that wasn't working for something that still isn't perfect but at least makes more useful trade offs.