Restructured and added some stuff to handle course dates