well, we're going back to the formula where she actually does nap, and when she does, it's either 2 naps lasting 1.5 hours plus 45-60 minute catnap; or she'll take a 45min nap in the morning, a 2 hr nap in the afternoon (after a long A time) and then a 45ish minute catnap. Today she woke so early that we let her take an extra nap, are giving her a late catnap and will put her down between 7:30 and 8pm.
Any other suggestions?