Revert "Add some basic calling structure to the code."

This reverts commit 9bb52fa4950fe1234c5d61417ecc9d339d55fbb9.
Resubmit