Fully merged, everything working