Changes to models and added a sinatra helper