Putting it together without parent child until end

My first pull request and my first attempt at updating the master branch. I have not used it since the creation of this project and have been using other branches. It'll be nice to have the updated code in master again.