Approaching feaure parity with old version, dump into repo