Commented out a bunch of stuff