Cleaning up the code. Completed @todo's and prepared for completing more with the addition of the Validate core class.