Completed all but import/search function