Updated with code review feedback, added schema.
Added new schema, may have gotten lost in the shuffle.