about to refactor, adding solutions