Updated code

Apparently pull requests are how you get my updated code back into your repository (if you agree with the changes).

Everything is ported and compiling now, but there are still bugs (for example keypresses don't work in the WFC).

I don't have time to work on that portion now, but you might as well get your repo up to date in case the other guy that forked it has time to look into things.