added item setup
temp update (merge later)
first pass working memory items
fixing merge conflict
Merge branch 'memory_items'