Finally updated my CS. It should be mostly finished now.