Recommit - additional validation
ES-311 - Implement Mandatory Feature of ULTIMA
Aldrin will update and implement the design
Merge branch 'master' of https://github.com/globeestate11/estate