Work in progress - migrating to angular