Current state
Merge branch 'error_messages'