WIP, Jigsaw rearrange, proper eventify, breaks build