last refactor for mod that will get everything else