Chris - Adds a core namespace to make parsing easier, and introduces options