Lots of updates regarding week 2 and DB programming