Updated components, and now some stuff is begin to adding