Working on moving function over