Changes to Logic

Commented out sections so that the project should be able to be built