More wip. Seems I broke something, though.