Working on adding memory.