Pull Request

Last pull request before we get the collaboration on track and working properly!