Fix bugs
Lied about testing before.  Now it actually works to build stages 0,1,2