Refactor combo getting function
Add some promises.