started migrating some code to angular