Working on improving list implementation