Almost done reworking results in views