Initial semi-functional-but-oh-well-no-u commit