Initial working version with persistent Shelf