Starting error checking. Have some badass alerts working.
Merge remote-tracking branch 'origin/master'