Move validations

Note: The blatant violations of DRY are scheduled to be removed tomorrow