First iteration of receipt page
Resolve merge conflicts