Upgraded base system.

Still work in progress..