WIP: Compiles but crashes on packet 37

Change-Id: I9f1f90a869c6a6ef81dd7d861c21f88a9cb94416