Options rewrite Step 2
Added display/save/load