Finishing conversion to Sinatra.