Added much more information, not done yet