added todo
related needs to be rewritten