More WIP on new API integration