Still not complete, but import is approaching functionality