b0dcb6b170
Move all types to their own modules
8d2e832671
Move join handling to separate function
7fd71c8f07
Fix crash after some while