Fleshed out configs, added caching
Merge remote-tracking branch 'origin/master'