Final push for the fixed project

This is all of the updated files and everything is fixed.