More experimental object-oriented things
Merge pull request #25 from RSchade/object

More experimental object-oriented things