Long overdue options lib re-write...