Added all sorts of stuff