Lots of things done in this commit...