Lots of updates to object. Added a new Options class.