Thurs afternoon - added validations, minor cleanup