Started re-write of RecordKeeper