Orm update

I spent some more time hacking together a Data class, and it's ready for some review. Take a look when you get a chance.