Proper parsing + debugging for future