Working implementation of PSC importing.
Initial merge