changed references to be to ids. Before cleaning out moment api details.