Move T0-DO to seperate file