Started working on FBAUP merge

> **Frodo:** You're late. 
> **Gandalf:** A wizard is never late, Frodo Baggins. Nor is he early. He arrives precisely when he means to.