Commented out and organized some things.