import function working...kind of
merged branch