Added all sorts of things