stuff
Progress on #2 and #8