Merge pull request #13 from roydude/v1-train

Stop 19325 from running (too slow). Block 19196.
Merge pull request #14 from roydude/v1-train

V1 train
Switched everything to use the new 'app' format.