Made progress on Generic API Calls