initial commit. Basic class declarations
merge