Restructuring views to make a bit more sense for this purpose