Fixed a bug and started looking at getting client_id programatically