moment calc changes plus a couple other changes that potentially are bad?
fixed mergeconflict?