Last Commit for 1.6.

Nearly Completed the base, once everything is working it's feature time.