week 3 base

make a feature branch off of this