jnrentity complete (hopefully)