Got the validation and checkboxes working
Added some tests and fixed some tests