Totally Broken because of API updates... This commit is merely a step towards fixing it, but does not actually fix it