Fixing things
Commented out dostuff, since it's broken