Additional cleaned scripts from challenge request. 

Adding some additional requests from the challenge scripts after some cleanup and testing.