Finished Goals and Added Rules.
Needs commenting.