Added basic LED control code
Fixed conflicts