Removed @todo. This work has now been completed.