callbacks n stuff

Change-Id: I03e73e2a89251db7737d6b0ee58c515a9cd9fea2