Switch to ls and add filtering