Beginning rewrite. Let the fun begin!