TN finished refactoring

Scheduling pretty looks