Feat/c value term extraction

I haven't done the tests yet, so do not validate the merge before I make them. Also, this MR does not contain the component optimisation part.