Reformatting. Everything is more standalone now.