Progress on #33

Items 1 & 3