Updated to 1.7

Still need to make changes to the API