All but one test failing. Almost there.