Stable release

Tagging the master branch as it currently stands so we have a snapshot of what is currently working before the otc-feature branch (which is a major change) is implemented in case we need to roll-back.