Added waypoints
Began client side validation