Consolidated how click and tick based increments are performed

Warning: still needs work on power and capacity algos