Temporary commit for pull and merge
Temporary commit for merge
NEW: Created basic classes and methods for the new object framework