change to object model; fix player names; add more angular