added JACS, OL, working on master class