entity wip
merge conflict test.html