Cleanup Pt 1
Begin to reimplement Cast Iron Lamps