Looks good so far, just need the remaining bits of your CS though