added edge functions/util
added edge functions/util
modified edge utils
resolved merging conflicts