Added Validation Checks
Fixed Issue Where Catapult Setup Script Wasn't Being Run