Made some changes, lamp doesn't work yet