Updated to include possibility of docstrings and stuff