More reorg/cleanup, make element reference to user.