Controller now singleton