1.7 support! BONUS: Actually tested a bit

TODO: Handle issues nicer