Made lots of progress today (see the "done" section of todo.txt).  Isn't quite ready yet though!