Moving things around, getting ready for vanilla lamp