Started work on Issue 22.