Error Logging - First draft(feedback?).
Merge conflicts.