Cleaned up everything, added everything.