Still have some unit tests failing, but much improved over last commit.