Lots of updates, nearly finished!