I think tests pass now, time to merge