Added new List model; adjusted views and tests to new model