Everything prepped for moving into master branch