Bring in mwise and skyeagle's work