Removing Grant's Work; Made updates to shooting to use gesture time