Finish implementing Import