fleshed out week 1 and 2