Revision 2 Final

Whoops, forgot to publish these changes to GitHub.
This is the 'Second Iteration' of the Comp Mod