Fleshing out more functionality
Update docs