another WIP taking a better approach...