Sketch implementation of RecordStore, various changes to other files