Large Update for OParl compatibility, will break almost everything, pre alpha