Filling out a little more, created more asserts and a couple of new decorators for work not done
update version of docs to use