Second commit.  About 90% there