Refactor lamp as necessary to work within the gear system

[this-is-envy]

See parent for details but tl;dr is: now that we have an equipment sketched out figure out how the lamp fits in and make necessary changes.