Cleaned up list files, reimplemented 2-1 with my own list implementation