More stuff done, too much to describe here!