Added method calls and TODO statements to mark them, but it breaks the simulator