Mooooore debugging
Committing things for complete merge.