TODO added. Expanded IRC class