Finalize frontend backend merge