Changed API to a singleton, GUI call to match