Commented some code out., previous commit wasnt working