Rename files to allow inclusion of checkbox code
Add support for checkboxes & begin tests for it