Major restructure and work on CC task.