Rearchitected just about everything. Still have lots stuff to add I think.