Making some more progress... Trying to make this one speedy.