Uncomment code that wasn't supposed to be

Too many branches going on and too much testing