Major Rewrite .7.1