merging mike's branch into mine

i think i'm not sure what i'm doing.