more tests passing. almost there
all but five tests passing