Initial work in wrapping the store