Please don't commit commented code. I recommend to use a separate branch on your end for each feature you implement. This pull request in some way implements various features. Have a pull request for each feature branch you work on, if you like.