ListController needs a cleanup.
Meh