More of the initial work and various additions