Large pull

So many changes, call me tomorrow (or tonight).