Finished getting rid of singleton