Bah. Wasted a lot of time on moments, then reverted almost all of it.