Preparation for end-to-end process

See commit messages
Again, so small... no "a"