todo
Back in the saddle, from/where dictionary problem nearly sorted