Brought inline with master branch

Docs coming….