#79 Swapping old API for new API, Phase 1
#79 Swapping old API for new API, Phase 2