my working branch
Merge pull request #1 from joshbarnettlloyd/Josh'sWorking

Josh's working