This looks visually good to me, but I haven't tested the code itself yet.