Work on progress
I think it's working now. A couple tests passing