Converted to S3 Classes, almost have example working.