major checkbox upgrade (still needs work)