going to modular in a sinatra app
merge