Validations mostly working
Merges script conflicts