Changes

structure
gathering and storing more information