WIP: Slowly fixing errors.