This much less of a mess now, and works