Using id for what gets included.
Adding a version of apply for testing with.
Continue the refactoring towards Chione.