Add option data structure

Add unit tests for the options