Trajectories are generated correctly
Version completely working. It will be migrated now to the main project.