now using @Atomic!
updated to use new async code
added @Atomic to EntityList, updated EntityMap