Started converting to 1.7
Conversions!
Merge branch 'Fuwnayguy' into bigUpdate