Merge Functions File

krabappel merge