Made some changes

I have gotten closer to having it functioning