Added object store and initial implementation of handling .off