Added more stuff and organized it.