Rewrite

Begins app rewrite.
Line is too long.