REALLY Bad Commit.

Updating the Solution with Latest Changes. And Updated Files.