Not quite finished, but gettingg there.