Add importing feature, clenaup.