Lots of new bugs but fixes incoming.