Added Goal
Conditions satisfied.
Removed extraneous stuff
Tightened up more