Refactor list a bit, at least make it work again