finished up to generic views