Attempting to fix up code

It didn't work but I'm closer.