Thanks, Jess.
Last night I put her to bed at 9pm and she slept through. I had to string her our from 5pm tho - she was over it!!
Hopefully her naps will work out better today. She only slept for an hour for her morning nap (which I much prefer) and she is now down for her second nap of the day. Hopefully she will wake up around 2:30-3pm (if not, I will wake her) so she can be back down at 5pm, up at 7pm and back down for the night at around 9ish.