Working on fixing the build and removing S3 methods.