Some work done for #22