Develop zan

Made a bunch of ui tests pass. 

![Uploading 1180912311983bb5.jpg . . .]()