Some tests still failing, working through them. Need sleep.