Proposed changes for easier pickin's

Currently using this branch for ModQ and would like to move this into a release version.