(NOT PUBLIC YET! IT WILL BE VIOLENTLY REBASED!)