Corrected mismatched method name
Updated todos