Initial drop of MJ.
This is for machines only at this point. Untested.

3Fixed compiler errors