Real Progress

Now I can finally close #2 and close #12
I'm relieved, but I opened up like 4 more issues today.
...