First commit from my branch, cleaned up contributors for my own repo and added my own questions.