updated todo and created more concise functions

almost there. still need to figure out how to loop through values of
each tensor component.