Code Review PR

A LOT happening in this updateLists function. Looks like it could get broken down into several methods.