Pull request to merge edit with master branch

Time to add it all back in.