Lots more of the code is now working.