Wip overloaded lists

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