Closes #384
closes #385
I think this is all we need, to Closes #386