Working on the CS. Possibly will be done by the end of this week.