Made some changes, but still needs some work.