Working on shelve repo