Api change/use entity proxies

PLEASE IGNORE! Just looking at preserving file history with `git mv` usage.