Added some todo messages.