WIP: A bit more progress