finally gets atomic entity working