Removed todo; See issues