Organize and add some stuff