Trying out doctests and adding comments etc