Last update before branching attempt. (No outside library projects
imported)