Partial 1.7 support
1.7 working :)