Simplify SQL function, refactor addRoll function. Currently works for sigle roll - need to accomodate for all rolls