Trying to reconcile various attempts to rework this into the master library, with github integration