working on tests passage, 126+35 to go