Merge pull request #8 from joshbarnettlloyd/Josh'sWorking

Josh's working