Rearranging code, temporarily breaking everything, and then fixing it
all!