Connecting components!

Many changes.