I think I'm about done, finally =) I still need to finish the bar on the 3rd floor (and move my potion station down to the 2nd) but I need to replenish supplies before doing so.