Both are done.  I just hadn't had the time before.