Added generic views, brokeit.. fixed it!