Major rewrite. Simplified and defined goals