Got everything to compile, now I need to see if the defunctionalizer works