got angular working but still buggy