began optimizing magic, added export query builder