Not sure if I'm done yet, but more progress at least.