Made some progress on Course logic