* Begin fixes to list handling code - there's 2 unittests that are failing due