[@Tojin] Updated. (almost to the point of getting the CS up)