Lots of progress; it even runs now.