Merging wolop branch

Trying to merge wolop into master branch, but I think I'm getting them backwards.