start addressing TODO items