I've only quickly refurbed the bottle cages, as I haven't managed to get other ones in time for the build.