Got error checking working but it is not sophisticated. Need to update later.
Fixed conflicts