Added basic option logic and unit tests