moved into sinatra