Readded Gridworld classes - closes #1