Beginning to touch entity stuff