Combined with Abby, but left some stuff commented out until livequery is eradicated