Initial work for MC1.5.

Sucessfully compiles at this point, needs testing.