Worked on a better internal list implementation