[Anton] Finished options framework