UI query tested / almost done, started upgrading example code