Added todo, made sure feature construction works