Merge pull request #5 from joshbarnettlloyd/Josh'sWorking

Josh's working