the code can at least compile now

I made some changes to Morganne's code. Check it over to make sure what
I did is right, but I think the changes I made are consist with the rest
of what you were doing