Jgs branch

Major updates, new results class,