Up and running, added two TODO items