did some more work...almost there...almost there