I'll hold off on the change to moment for now - I'd rather make the right one the first time then several different ones.