Fixed up methods. I think they work.