Continue implemented listing functionality
and more work