Refactor gem and allow for multiple fields in form