Major updates all over the place. It's coming together