Final API Commit

Final Changes to the API