Been chipping away at this a little at a time between other work, but I'm calling it done now. Feedback always welcome.