Moved to lenses, which reduced number of modules. Started on basic thread functionality