Remove all warnings, implemented adding user location to path points,
made better design