Added the beginnings of functionality to Room