First pass at submission copy
This version appears to do everything it needs to so far. May be turning this
one in.