Finish up draft stuff (fixes #139)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>