Lister implemented + ready for testing
bunch of changes