add basic listing
Merge branch 'dev'