did we over-engineer this?