Work in progress, part of a big piece. More bits soon!