WIP - use local angular and zone