Added methods (wip) and some docstrings