Merging zkendall changes

Remove todos (converted to issues)
Merge zkendall changes

Merge zkendall changes