Bring in Neroth's work as a new branch