Almost everything working correctly...