Added Shoulda and dependencies with discipline and question