Begin design rewrite
Use new header
Rewrote missing file