class IDF changes, added TODOs