Documentation added, todo removed.