Clean up... Base structure created... Some of the class assembled