More work towards SER-17

All the stuff needed to SER-17 #resolve