Yes yes yes. That's what I want to do. This pull request is too huge already :-)