More changes.

This will all be erased and converted to WIN code soon...