Added proper list functionality
Merge branch 'dev' of github.com:savi-bcrl/aurora into dev