Improving support

Just working away at add functionality. Individual PRs seemed too fine-grained at this point, but feel free to disagree and I'll separate out.