[WIP] Heartbleed

Pushing this out to get some review while we continue to add on to it.