Change a lot of stuff + add CSSE2002 stuff