Merge pull request #6 from joshbarnettlloyd/Josh'sWorking

Josh's working