Update development code with safeApply, elementWatcher, singularization of data and controller wrapper :)