20140701

Working on class definitions