First pass of 3.x support

Not expected to work at all at this point

Signed-off-by: Alec Ari <neotheuser@ymail.com>