Changes after initial integration with competition robot

These changes were initially made on a stale repo. They were stashed, the repo was sync'd with upstream then the stash popped and a conflict resolved with the encode values.