solved all the TODO items