Revised teach mvp. Closes #48.