Singleton Controller and Logic instance
Merge branch 'controller/sharon'