Finish 5.10, & 5.11, Add validation