adding drawing of all units to player class
fixing conflicts