Check in fixes for AR GRaph.  Migrating JS over to OO