Coding round done, but not yet tested on my development machine. This is
an interim commit