added runner and add validations
added TODO