[WIP] before complety ripping everything up
WIP - before reripping everything up again
Working version of schema importer