Initial commit, some files merged from 1.6 to maybe or maybe not work... some default stuff as well. Too much to individually break down