No idea what I did, committing everything
Made some tests from lis.py pass (will add to tests file later)