The branch now builds and passes tests