Addressing, Removing TODO comments fix issue #10