updated todo
sweet joys of trimming code