Adding.
Removing temp stuff.