Added page uploads, refactored Checkable