Cleaning up to properly start working!

yay