Rewrite and add to architecture chapter