implemented new views. (still some for account missing).
Waypoints still not working