More work transitioning to Sinatra::Base subclass