architectural rewrite complete