Added Some checkboxs(still need wiring up and labels). Commit prior to grabbing couple hours sleep