Tighten up Entity constructor and start working on indicator.