Recreated and added many, many things.

Approach cautiously and merge cautiously. Stuff may break.