I went out an bought a bigger breadboard today so that I could prototype everything to make sure that it will all work together. The breadboards I have are small so a big one will be nice to have. I took some time to wire everything using wire that is cut to length so the result is a nice and neat and fairly secure breadboard. Check it out! 

The light switch is not included in the picture above but it should be fairly easy to implement with an optocoupler or something attached to an Arduino pin.