Revert to rootscope for now
Initial
Update controllers