Now storing last selected item
Merge branch 'temp'