Round 1 of adding PKG_OPTIONS. Needs more testing.