Wip overloaded lists

Got a little carried away and cleaned up a little more with a traversal.