Everything working now