Now tracks user choices (+basic amount page)