Coding changes to 1.1a1

Redesign
See class diagram at: