Ugly interim step, don't look

The project is about to change direction, but I wanted to save it here