Updated with changes from Gitbub and dev machine.