Better lists

Merge of "Better-Lists". Includes better lists and collision work.