Trying to fill in the TODO's, didn't change anything, i think, maybe i
did