Commit before refactoring to split out list views