Tuomas's parts mostly done