Added a todo and fixed a damn null. I get too obsessive. I need to go to sleep!