modules working, although not entirely the way I would like.