Merge pull request #11 from ccummings/wip

Wip
Big update, caching model almost working