Schedule now does't look like crap. Fixes #41