Merge pull request #2 from brianwarner/dev

[sgoggins]

This may not be the ideal way to manage data, but let me give this a shot and see what other ideas we come up with when trying to get the "base affiliation data" to a more immediately useful state.