WIP code rearrangement for formatting and multiple recalls.

MIGHT NOT COMPILE YET.