Finished implementing -q, however several changes were made that may need to be reversed, as the were unnecessary and complicated matters.