Just saw this after posting my solution. This is a much nicer approach.