Evan branch march21 1

took to work on tests