Beginning of our .x importer

As well as some additional changes