merge prep
color-changing stuff (body unfinished)