Debugging

Almost done with this iteration