added list and code relationships, refactored containers, refactoring
throughout