docblocks added -- @todo needs to be addressed