Work on defactoring and light/lamp (TODO: decide weither to call it
lamp, light or something else)