* Comment.
* Cleanup entity interface.
* New implementation of the Machinist.