A bit too much stuff in places but ok