finished porting main app to angular