added onclick variables
Fully updated API
Fully Done Now
Merge branch 'joelg'