lights and rolling
refactor