Did some hardcore debugging