Formating Things and Fixing imports
Comments...
I'm getting lazy with these commit messages...
New Variables, and Bug Fixes