week 2 updates, move week 1 to a package