In theory, it actually works now. Haven't tested everything, but prelimiary reports look good.

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>