I should probably debug THEN make commits