Implements the Vocabulary changes necessary

This is a sin. I am compiling additional changes on what was supposed to be a temporary branch to get us to where we needed for a demo. I will go to hell for this.