Issue 82

In progress...