progress on functionsgit pull
fixed merge conflicts