drop dummy calculable
define list of calculables
switch to the usual collection syntax(pair)
use the fromCollections trick