Newer Version of Final Proj

Newer version.  (Still broken)