Merge pull request #7 from joshbarnettlloyd/Josh'sWorking

Josh's working