work in progress; added moments