API Wrapper and testing - should be done
More API Adjustment