closes hbshci/fhi#165, finished first 7 pgs of hbshci/fhi#166