Lots of stuff not working any longer need to work with Andrew on this