Started cleaning up master branch. Going to merge with origin/Gutted