All Files Updated with latest code.

This is the second most important and largest commit.