Updated to develop, construct is still broken, Jena can almost be
removed