List, Add and Edit Items BIG Refactor...