Smash Day Commit 2b

*Cleaned up some stuff from a bad commit