closes #1 closes #2 - Added CPM and CPA