Initial commit, based on my chosen/option_adding branch
due to lack of extendability the 'Add option' link is always shown