K... last refactor for now