Added working, but ugly, List