Teach time

This branch has been preforming fine on the server, I don't see why it shouldn't be added to the main branch. Fixes #9, #5.