tried bringing all the most recent ontology stuff together for the builds; work on #160