Ok, thanks Wei - appreciate it! 
See your comments re: the lawnchair adapter - pretty sure it never gets used, but you're right, I'm not using callback like I should all-over the place! Will fix those later today