updated framework and implemented datasource and delegates