[WIP] Getting there, one bug at a time.