Frontend rewrite finished...