Adds big refactor for dime