Deleted OptionBox as unnecessary, refactored
Merge branch 'master' of https://github.com/btrindad/CodeSwap