Up to the point of bringing in Sinatra