Pull request final submission

this pull request is the submission for @wearanacapa @sean2015 @davidfpease @connorcwilson