Nov 10 Update

Updating Github with latest code as of November 10th