Checking in all changes from testing Friday!