Initial Waypoint view completed - need to finish dynamic Waypoint card creation.  Allmooooooooost dooone.