Basic opportunities page
Merging changes