Maybe the last refactor for tonight...