A huge ugly commit that produces a working application