Work on adding MNIST support