Starting changing to allow real data

I didn't finish. I left an undefined constructor to mark my place.