Sounds like you had a good weekend, its been crazy at my place as well which is why I havent been here much.
We plan to do the same this time around as we did with Logan; Keep the baby in our room til she reachs 6 months old & then transfer her into a cot in her room / a shared room with Logan - who will then be two.