Refactored, and began api calls