Added components but still in progress