Here we go 2.0

Added Error Checking