Security/dump msg types

I'm not sure if this should be merged or not, but I'm leaving this in the tracker anyways.