99% finished.

All necessary changes made.