working through angular mess