Implemented list command - needs tidying up