Add in some anticipated gems.
Sorry, big ugly commit.