Done 2

Little wonky, but it'll do for now.