Update Database + A few views. Still pretty raw