Changed angular to allow multiple controllers, getting there