General question here.  I see a lot of these commented out blocks. Are they pieces you are unsure should be removed or things that you plan to alter a bit, and then uncomment? If they are no longer needed, I would vote to just remove them, we can always pull them back from git history if they are needed for something