Alpha Testing

This merge will result in the mater branch being ready for alpha testing.