week 1 done except heroku stuff