Work in progress

Half way to a more general Cost Definition architecture