Finally added all components… I hope.