That was the last-minute-commit that made everything work and pretty enough! yay!