20140715

fixed caching probs
big x's

rewrite coming soon