Issue 116 legal

Stuff to review... I'll be dev available this evening for a bit