Add skishore's todo