Adding more functionality, docs