Final Draft (Second Upload to FSO)

I left in some code (you can see what it is here) that I meant to remove
from my final submission but looked over. I will re-upload this commit
to FSO (it will be the second and final upload).