Changed List system
created basic list modification
Solved merge conflicts