Added some stuff and did some fixes... needs more fixes.

I've got some suggestions for making this better. As it is now... it's
not gonna work out so well.
Ok... Git bugged or something. More changes.