Try to see if we can make the course standalone too