Merge pull request #2 from joshbarnettlloyd/Josh'sWorking

Josh's working