Update 12

Added skeleton for contextual options