Added docblocks and todo