functions can now take multiple parameters and function headers are loaded into the editor by default
merging conflicts
merged EVERYTHING