Major changes, adding in new components/examples