adding sperate term import
remove import calander since we don't use it
still tweeking updates