More docblocks
Started tests